bitkeeper revision 1.1236.1.178 (424c71ffL0fO0Lled7Iksns4CZgUlw)

manual merge.

diff --cc linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
Simple merge

diff --cc linux-2.6.11-xen-sparse/drivers/xen/blkback/common.h
Simple merge

diff --cc linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c
index 174b5c56b02bd44008449411084cba896ae1d9e0,90d194680bbdb4590b6bee834db3bb2884f1abfa..2a67780755d7c5e147bfe602fcaee3b0662d55f0
--- 1/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c
--- 2/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/vbd.c
@@@ -13,12 -13,10 +13,14 @@@
  #include "common.h"
  
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 -static dev_t vbd_map_devnum(blkif_pdev_t);
 +static inline dev_t vbd_map_devnum(blkif_pdev_t cookie)
 +{ return MKDEV(cookie>>8, cookie&0xff); }
 +#define vbd_sz(_v)   ((_v)->bdev->bd_part ? \
 +    (_v)->bdev->bd_part->nr_sects : (_v)->bdev->bd_disk->capacity)
+ #define bdev_put(_b) blkdev_put(_b)
  #else
 +#define vbd_sz(_v)   (blk_size[MAJOR((_v)->pdevice)][MINOR((_v)->pdevice)]*2)
+ #define bdev_put(_b) ((void)0)
  #endif
  
  void vbd_create(blkif_be_vbd_create_t *create)